bitkeeper revision 1.1172.1.1 (420ba344y-TLJ8cFOVA_8bN7wd3dMw)
authorkaf24@scramble.cl.cam.ac.uk <kaf24@scramble.cl.cam.ac.uk>
Thu, 10 Feb 2005 18:09:08 +0000 (18:09 +0000)
committerkaf24@scramble.cl.cam.ac.uk <kaf24@scramble.cl.cam.ac.uk>
Thu, 10 Feb 2005 18:09:08 +0000 (18:09 +0000)
commit52ba37dd67bcba42ac17f020c6d9730a0dab2625
tree2b4f3d0011f92d454b9c15bdcaaf263a0bc01d69
parentca0f9b3cf73d138fe67d8bf8c4a98cbe573d6aab
parent091e799a840c8af9a9affb41bade805375182a25
bitkeeper revision 1.1172.1.1 (420ba344y-TLJ8cFOVA_8bN7wd3dMw)

Merge scramble.cl.cam.ac.uk:/auto/groups/xeno/BK/xeno.bk
into scramble.cl.cam.ac.uk:/local/scratch/kaf24/xen-unstable.bk
xen/Rules.mk
xen/arch/x86/Makefile
xen/arch/x86/traps.c